bitkeeper revision 1.1159.272.6 (423ef7cda7Kpa_XoIQvmnA23rDLP2Q)

remove some bogus test while removing device

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
index f9265e74ec9e428f413f3264192533d584781350..8dce5bd8ce7e3b7975b54743d86f73e0d6ceea5b 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
@@ -365,7 +365,7 @@ static int xlvbd_init_device(vdisk_t *xd)
  */
 static int xlvbd_remove_device(int dev16)
 {
-    int i, rc = 0, minor = MINOR(dev16);
+    int i, rc = 0;
     struct gendisk *gd;
     struct block_device *bd;
     struct xlbd_disk_info *di;
@@ -393,7 +393,6 @@ static int xlvbd_remove_device(int dev16)
         goto out;
     }
 
-    BUG_ON(minor != gd->first_minor);
     /* The VBD is mapped to an entire unit. */
     
     invalidate_partition(gd, 0);